Patch to not use z_uInt
authorIOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at>
Thu, 21 Jan 2016 15:08:49 +0000 (16:08 +0100)
committerIOhannes m zmölnig <zmoelnig@umlautQ.umlaeute.mur.at>
Thu, 21 Jan 2016 15:08:49 +0000 (16:08 +0100)
debian/patches/no-ztypes.patch [new file with mode: 0644]
debian/patches/series

diff --git a/debian/patches/no-ztypes.patch b/debian/patches/no-ztypes.patch
new file mode 100644 (file)
index 0000000..a0b2aff
--- /dev/null
@@ -0,0 +1,42 @@
+Description: do not use z_uInt
+ the zlib/gzip consumers use a type z_uInt, which is nowhere actually defined.
+ use (uInt) instead
+Author: IOhannes m zmölnig
+Last-Update: 2015-01-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- juce.orig/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
++++ juce/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp
+@@ -87,8 +87,8 @@
+         {\r
+             stream.next_in   = const_cast<uint8*> (data);\r
+             stream.next_out  = buffer;\r
+-            stream.avail_in  = (z_uInt) dataSize;\r
+-            stream.avail_out = (z_uInt) sizeof (buffer);\r
++            stream.avail_in  = (uInt) dataSize;\r
++            stream.avail_out = (uInt) sizeof (buffer);\r
\r
+             const int result = isFirstDeflate ? deflateParams (&stream, compLevel, strategy)\r
+                                               : deflate (&stream, flushMode);\r
+--- juce.orig/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
++++ juce/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp
+@@ -126,8 +126,8 @@
+         {\r
+             stream.next_in  = data;\r
+             stream.next_out = dest;\r
+-            stream.avail_in  = (z_uInt) dataSize;\r
+-            stream.avail_out = (z_uInt) destSize;\r
++            stream.avail_in  = (uInt) dataSize;\r
++            stream.avail_out = (uInt) destSize;\r
\r
+             switch (inflate (&stream, Z_PARTIAL_FLUSH))\r
+             {\r
+@@ -136,7 +136,7 @@
+                 // deliberate fall-through\r
+             case Z_OK:\r
+                 data += dataSize - stream.avail_in;\r
+-                dataSize = (z_uInt) stream.avail_in;\r
++                dataSize = (uInt) stream.avail_in;\r
+                 return (int) (destSize - stream.avail_out);\r
\r
+             case Z_NEED_DICT:\r
index 0ca28ba3a572ecc55203203b6a3a343ba64fd6d5..1c9358264e64abe5f4c4ca8eaf1b228e5bd4a520 100644 (file)
@@ -1 +1,2 @@
+no-ztypes.patch
 do-not-track.patch